From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 11 Apr 2016 16:07:16 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~3251
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=7b45cc583c4f16cc070a9925431ca944f510a685;p=emacs.git

; Merge from origin/emacs-25

The following commits were skipped:

0d7aad1 Revert "Backport HTTPS proxy fix"
2d1a605 Backport HTTPS proxy fix
---

7b45cc583c4f16cc070a9925431ca944f510a685